From cd03a9e97718fd88b65777c80be957283a3a00e9 Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Sun, 17 Jun 2007 14:29:21 +0000 Subject: [PATCH] Remove pointless logging for unhandled events. Activate the application on 2007-06-16 Richard Hult * gdk/quartz/gdkevents-quartz.c: (find_window_for_ns_event), (gdk_event_translate): Remove pointless logging for unhandled events. Activate the application on non-left clicks, since that is only done for left clicks and we depend on it to get events routed properly for context menus and other popup windows. svn path=/trunk/; revision=18175 --- ChangeLog | 8 ++++++++ gdk/quartz/gdkevents-quartz.c | 26 ++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b37f50689..e6ba2c0796 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-06-16 Richard Hult + + * gdk/quartz/gdkevents-quartz.c: (find_window_for_ns_event), + (gdk_event_translate): Remove pointless logging for unhandled events. + Activate the application on non-left clicks, since that is only done + for left clicks and we depend on it to get events routed properly for + context menus and other popup windows. + 2006-09-22 Dennis Cranston * gtk/gtkfilechooserbutton.c: (change_icon_theme), diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index c69a822617..3077910af8 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -1266,13 +1266,9 @@ find_window_for_ns_event (NSEvent *nsevent, } break; - case NSAppKitDefined: - case NSSystemDefined: - /* We ignore these events */ - break; - default: - NSLog(@"Unhandled event %@", nsevent); + /* Ignore everything else. */ + break; } return NULL; @@ -1538,6 +1534,17 @@ gdk_event_translate (NSEvent *nsevent) if (result == GDK_FILTER_REMOVE) return TRUE; + /* We need the appliction to be activated on clicks so that popups + * like context menus get events routed properly. This is handled + * automatically for left mouse button presses but not other + * buttons, so we do it here. + */ + if ([nsevent type] == NSRightMouseDown || [nsevent type] == NSOtherMouseDown) + { + if (![NSApp isActive]) + [NSApp activateIgnoringOtherApps:YES]; + } + current_mask = get_event_mask_from_ns_event (nsevent); switch ([nsevent type]) @@ -1628,8 +1635,9 @@ gdk_event_translate (NSEvent *nsevent) dx--; } - break; } + break; + case NSKeyDown: case NSKeyUp: case NSFlagsChanged: @@ -1645,8 +1653,10 @@ gdk_event_translate (NSEvent *nsevent) return TRUE; } break; + default: - NSLog(@"Untranslated: %@", nsevent); + /* Ignore everything elsee. */ + break; } return FALSE; -- 2.30.2